Updated consumer and started adding submodules