Add core classes based on class diagram