add new class to build messages to notify; refactor