Removed unneeded explicit JSON property names
Moved from internal to normal discovery uri
Added event result containers