Added classes for message handling
Keyboard is now handled