Refactored to use YAML file for markup definition.