Core Class is Updated