added partial support for more parametres