chore: Perfomance improvements