Updated model to remove double import.