Added checks for @config