Added initial Query implementation, onAdd and onDrop methods