Updated with more flexible metadata support in pages and site.yaml