Adding support for custom fallback locations