Changes added for Raas Client