More work on plan generators