Added support of generated parameters