#898 Repo.Smart methods added