Simplifications to websockets api