Add more info for Entity