Refactored status into architecture