Some inmprovments for Entity.java
Some changes in Entity