Added fetures and expanded config