Added category features and some others