Context class resolvers

Depends on #419