Readjust method signatures