Updated core to 3.0.2