Add Dado for dependency injection. Improve activities