dao interface changed; code convention revised