Refactoring in order to have flexibility to use different scheduling schemas for messages updating