Moved EntityAttributes and EntityIdPool to separate files
Added some methods in Entity class