Added Foreign Source Category
Fixed Collect method for AopManager
Fixed a removed category not suitable for EOC