Added support for bhava/bhavatat