Expanded config options
Cleaning up
Renamed due to clash
Cleaned up