Finer grained method replacement. More coverage