Fixed comments, namespace path and check the condition of "columns"