Changed the "double import" thing in models