Remove code duplication from Category