Finished adding manager support