Re-implement constructors

#15