Updating database create script to solve Location issue