Added simplified Device and Resource classes