Build 75: Performance optimisations