Changes to allow for devices to have custom attributes assigned to them.