Changing from properties to YAML