Added device struct fields