Added NOTICE support