Change strategy, because we were overriding all the defined columns