completed the scheme adaptation for master app