Better argumets handling