Fix class module
Enhance entity && queryBuilder classes