Revert "updated entity module"

This reverts commit b90c1bb39cc3c6f0d733da4da2404b094b70e521.