Improved parameter's passing