Add support for multiple location blocks and added a few other options for location