Re-add deprecated maps