Made some minor adjustments to Entity classes