Refactor operator system properties