Added a constructor?