Adapting to the new ER