Changed method signature to replace old struct