Start new version. Better handling of existing methods. [ci skip]