adding more core classes