Remove explicit CommonJS dependency
Save constructor build method