removed some parameters in extension calls and replaced them with class
args which are more flexible