Fix issue with not set attributes - now returning None, this needs to get handled in the metadata object