Adding config parameteres and grammer changes