Add parameters editing; refactoring.