Changed the constructors' arguments orther