Adding configuration mechanism
Adding configuration mechanism