add support for new parameters handling