Added functionality to some resources and repository