Removed hardcoded dataElements and added fallback if formName isn't specified: just uses name