Added support for enumerables