Added axis and button counts