New service, dao, and code updates