Additional work - need to go the whole hog and base on virtual qualifiers

Signed-off-by: Gavin Halliday <gavin.halliday@lexisnexis.com>