Deduplicated and cleaned up prototype Manager