add return in get and put callback function