[Client] - Removed dependency of activesupport and builder