Moved Queries into Module