added some concerns to remove duplication between models