Better arguments handling
Even better arguments handling