added Gender and GoalUnit functionality