add injector
enhance query function
add injector