Modify put and get operation