Added Key collection
Renamed code generation task to 'generate' ;-)