Worked on populating feature and added in support for custom model tag