Added constructor in Entity