Use class instead of base pointer
Merge branch 'master' into xep-0223