Migrated additional conditions to parameterised conditions