Modified to use domain helper