Changes for local domain development