Bundle/CRUD generator updates