Update UML-scheme, refactoring
Remove static application members