Fixed requires, added devices field get/set