Refactoring and additional messages support