Internal Core Classes updated