Updated domain design