Fixed some imports and changed param