Added loose metadata support