Dynamic metadata support added.