Responsiveness optimisations