Add .addItem and Fix bug