add argument and validator results
adapt internal api calls