Better importing mechanism