Version 0.4.0 - Generator support