Added properties to location entity and added activeFlag to list location