extend support for more argument types