Better handling of page includes