revert integration of YAML parser
Add pagination class