Added basic metadata support.