Metadata support fixed. Yuck.