Added more automation