Allow both old and new rails