Fixed function agruments according to new API