minor changes (removed WpDbase class)