Change some of the APIs (retval int => boolean, key => String)