Made the interfaces more consistant