change generalDao and service. add Queries interfaces.