fix entity class
fix GA core