Modifications to make server processing easier.