Tidied up column mapping in account table