Better config.yml structure