Add arguments support
Remove console log