Added more parameters handling