Updates for Sandicor compliance