Changes to accomodate constructors