Ticket 2519 - Refactored config.json