Resolutions -> variants refactoring