Make domains a little more generic
Make domains a little more generic