Added in metadata support, but not more blocks