Improve static pages spec