Refactoring structures for monitoring and restrictions