Change instantiation of resources to use kwargs.