Refactored class stubs and new diagram