Add environment and fix error from import