Make Client module embeddable