Additions to Normal User module