Modernization

Modernization work, v2.2.0-alpha