Core 3.0 updates