Some refactoring. Introduced annotations.