[RJA-2095][feature] - Using common api class for the sake of uniformity