Domain updated for Anatoliy
Small refactoring