Added categories and class extensions