Update types

Updates based on results of discovery with RPI