Change to interface rather than instantiated class.