Refactor of model scope and helper; CR GA