Added initial core classes