Functionality added for adding various entities under type specific code check (after merge)