Removed sqlwrapper from changed methods