Added resolver abstractions