Made some changes to the transfer handler classes.