Consider simplifying interface