Added manager implementation