Removed @with_settings decorator due to generator errors