Prepare for refactoring
Validation argument and parameters, more in TODO