Restructured the Entity binding