Added support for qualifications