Added annotations + removed unnecessary ItemBlock stuff