Started to change to a safe get and subscribe in a repository