Refactoring. Added unknown passed arguments and missing arguments