DEV-7 | Move to Json config