V2 - add KeyboardLayoutManager