Additional updates to use dao model through services layer.