This should not be handled in a factory