Added support for computed keys