Feature/qbo new fields