Minor changes in Dysco and Entity class