Rename bbl query class, add bbl object