Harshit | Added support for single entity case without any relations.