Add Method class and remove startMethod, finishMethod, etc