update for Derby 0.6