Added more features in the expert mode