Update conditional compilation logic
Rework on duplex logic