basic client management added