Fixing TableMapper so that it...works