Add missing configuration
Apply comments