Added parameters and validation