Updates to utilize permission masks.