Updated for new QB module