Updated to way/generators:~3.0