Improved importability of server module.