Refactor parser, add Data circles and bubble