Update to use latest best practice
Include settings