added Binary, Metadata and Entity