Added final modifier, added dependency injection to resources