Migrate to a method structure like
Update comments and migrate from addUrlHandler to when