Modernisation of codebase for more recent architectures