Improvements in model code
Changes in Location code