Added oop pattern to server tool