Yes - I forgot to say that I have serviced the entire engine including oil, oil filter, fuel filter, air filter and crank case breather filter.
The funny thing is that when the engine slowly picks up revs than you can feel the power coming out, but it takes ages for it to pick up the revs. I guess that if the fuel pump is defective than there is no way that the engine gives out the power it gives on high revs.