Added keyboard support (not user defined right now)