Improve wiki subclassing

Closes #36