[+TASK] Updated Setup class for external calls