Minor changes to metadata class
Added data class. Seperated out metadata class