Add remaining location types