Updated model duplicate code