Added two device types