Optimisations and extend example