Update for v1.5