Further refactoring. Reactive relations and their annotations