Changes for v1.5