Improve automation; add dependencies