Made modification to allow custom data parameters