Added manager logic