Improved effect management