Simplify restricting system props