Refactoring. Collections introduced.