Updates to constructors