More work on resolver