Improve basic options