SPLEVO-340
If-Else Refactoring With Static Configuration Class

-updated condition refactoring