Added keyboard state, mouse state, and base state