Updated Import function detection