Added delviery locations collection and cleaned up global helpers