Started defining domain
Defined more metadata
Fixed JSONs