renamed PropertyContainer to Entity