Updated with Model Duplicate issue fix