added new params and few other fixes