Generic attributes adding in parseRFormModel and some improvements