Remove duplication from components with nested options