Refactored category methods to reduce the risk of conflicts with client applications.