Updated to match latest restrictedobjects module codebase