Changed order of params on get/put functions