Enlil refactoring