Changed config structure and comments for easier understanding