Refactoring. Release 1.1