Remove interfaces, add some helper methods.