Improved performances

Change-Id: I781f20654191135a2641fc0222fec8974d8bb893