Fixed exporting for constructors