Category: Design re-implementation