Moved shared method to internal category