Add support for language pages (merged commit)