Added location external code to location table and managment