Added support for alle case-types etc