Added auto-resolution