Added some standardisations