Quote key names in key indexes
Adding small integer support