Moved columns from hardcoded to load from datastore.