Cleanup DI & reduce required declaration of every resource owner