Return constructors instead of exporting