D
Add Delete, Fix QueryBuilder