Added ClientMessages, other updates and additions