Issue #204: Resurrecting arbitrary mappings of Entity to remote bucket name