Add more advanced options