Update docblocks
Update client interface to be more strict