Further standards compliance