Moved object generator so it's available in the dependency