Update schema, added config and renamed stuf