Added parameters handling