Performance improvements on load