Refactoring

Removed id from json schema as it is unclear if this node is needed.