Bond support added
Fixed envs and other