ENHANCE: Improved the Barrier to be more reusable