Refactor - changed consumer to match new architecture