Refactor DataSection to return Optionals. Remove default value methods.