Added more items, entry commands and created another class