Added advanced options to map