Fixed import declaration for default+batch case.

Also removed deprecated `kind` property.
Fixes #161.