Started changing variables to the construct vars for generic sitemap class