Code Review 4/5/2013 changes - Part 2 Domain