refactored stops and shapes api