added some modules and raw query method