Changed _build_data to expect also values directly after the equal sign