Zone parsing & refactoring