Working on static pages support