Added additional parameters to constuctor