Added additional stubs from UML diagram