add metadata support etc.