Add some additional option support for non-default parking lots.