Refactored active and passive devices