improved server and san import