Changed exposed signature to expose correct constructors
Sync commit. Broken