Deprecate constructors

Changed the constructors back, deprecated them, and added the updated
constructors.