Updated ENB packages

Resolved #712 
Resolved #713