Added support for gen Chambers