Added initial support for Cherokee and Vai