Resolve imports correctly