Added new fields and new entities