Downgrade JDK from 1.8 to 1.7 and fixed entities distribution