Modify resolver interface
Fix concatMap()