Support custom config file
Incorporate config file changes better.