Lots of refactoring around api changes