Added factories for remaining select components