Added Core Class