
            refactor code based on api changes (#518)

890ae21