configuration macro refactored