Added categories element
merged conflict