This issue should be solved without any changes in plans. Later, in another ticket, we'll do a refactoring.