Updated to core 7.x