Preperations for better Yaml mapping