Updated to support new methods