Added simple metadata implementation.
Commented new methods for metadata.