Add some optimisations