Multiple changes around metadata + simplification of default metadata