some config change and new support