added more changes with Line/Rect and Report runtime parameters