Tweak to get default column values to work