Added excessive string/var enums