Better implemented the config