Add args support. Not full implemented