Add basic handling for a default loc/org