Refactor to allow Archive lookup by unqualified relation name