Use more native types instead of all strings