Added more features to advanced options