Progress on Entity and Manager