Modified the database layout.
Added back full access to metadata.