[REFACTOR] Updated for speed analyzer