Adding generics support to Device Manager