Add return values to device methods