Make changes for v1.3.0 framework