Added functionality to automate base app