Added params and some fixes