Improving PHQL namespace aliases other improvements