Changes in Entity, added some codes to load data