Refactored extra parameters handling