Added constructor params