Support solano.yml
Updated per review comments