Added device
Added ack, reorganized type id validation