Addition of core classes