Improved option interactions