Refactor Handler/Angular for Visitors/Members