Expand Client module