Added separate classes. Disabled messages.