Add env command and builder
Fix failed merge