Created basic entity handling