DEV-49 | Change to external config
DEV-49 | Resolve problem