Redesign policy management logic