Refactor and redesign domains

Remove EAGER