Fixing Equals is not implemented
Improving api for structured metadata model