Added new attributes to entities