First major changes based on RTL support.