Change handlers to use new repository interface. WIP