Correct import and declarations