Add bullet class, graphic and refactor