Move import to correct file
Single place to define kwargs