Improved get and put