Changed endpoints to be optional when emitting messages