Add kwargs to several functions