Added categories and time