Refactoring. Step 1

Add new methods. To be continued.