added support for client generation