Updated the static pages support