Updated for version 0.60.3