make my config compatible with master

Update and make my config compatible with master