Updates for using ENET