Modify for build