Add initial implementations of some fields, remove Metadata type