Some core classes added