More robust handing of creating data based on config, less hard coding