Compliance Framework improvements