Started with improving import functions.