Better handling of qualifiers