upgrade to java 1.7 and extended all entities to base entity