Simplified enb config

Resolved #883