Improving support for permalinks