Changed interface to be more consistent