updating models to no longer use scope