Added simple args support. WIP