Import added and major scheme change