added support for drop and query