Updated service and db dao