Add compatibility classes of core again