Add support for custom column names