Optimized Bhava class and added keys for Rashi class