Added excludable column ordering and some renaming