Updates to bill processing/model