Fixed up annotation mockup to work with webservice