Add remove queries as wel