Adding some device management