Finished converting internal code to use managers