improve and set defaults for wrapper functions in a better way