Controller generation support added. Enhancement #2