Added category files, but context bug exists