Move source config in line with other commands