Changes to support builtin protection