Changing Hockey architecture to iOS standard