Changes in config and code redabilty