Added KeyboardHandler and some constraints