Updated rpg-server to conform to spec