Client module extended