modifications to client - verify with update, more meta data classes