Performance & memory improvement