Added compiler optimisations