Added queries and handlers.