Handlebar related changes