Added keyboard interaction