added new attributes in entities but I need to fix the relationship later