Added email per domain feature