Improved location
Added config values