feat(performance): Major performance improvement