Refactored Constants to Settings
Prepared the CollectionConsumer to support v1