Add extension-adapted subpage and close #22