Tartaros: Improved mapping and added support for some page queries.