#162, #163, added arbitrary billing fields