Switched to serverId and added java.util.logging