Modifying servers to work with library changes. Also making global constants and variables exported