Update to bring methods and functions in-line with extension