Added default value logic to a base class