Added parameters to constructor