Remove duplication
Add remaining parameters