Updates to use new scout and device modules.