add more data; simplify to only custom annotations