Added speed component. Will refactor to iOS Directory