Adds Device model for device/user mapping and registration flow changes