Added metadata fields and rudimentary support for Access