Create/Update of client module and database changes

Create/Update of client module and database changes