Self options improvement