Resolved upgradation errors. All specs good, yet to remove some additional gems kept for compaitablity.