Adding configuration support (Working now)