Unit factor now comes from the yaml file