Improve imports and rename method