Addd necessary helper pages for end users
 Merge