Started adding duplication support in the model