Adding generic type T to accuracy code to remove wildcard headaches