Refactored assignDefaultValues method.
Added ExpressionValueFactory.