Adding changes for more permissive column names