Category overhaul (adapt to WCF standard)