Added very basic metadata support