Yaml handler refactored to take only yaml page parts