Updated findData, added findParameterData