Added advanced options