Improved stopping on non-implemented methods
Removed a region
Further naming refactoring and dependencies relax