Better key strokes handling