added enml headers, and updated resource handling