Adding folder import support