Started to add advance configuration