Added additional parameters to constructor