added 'resolve' option