Performance optimisations