Added category context validation