Updated services & dao