updated constructors after refactoring in client code