Added client base module