Added support for cases