Added basic handling of the metadata