Add callback arg support