Add development tools
Change query method