added entity and manager structure