added most core classes