Adding metadata fields

Signed-off-by: Alan Gardner <alan@armoin.com>
Merge branch 'adding_metadata'
Test coverage

Signed-off-by: Alan Gardner <alan@armoin.com>