Here is a cleanup of my previous patch, to do away with the setattr()'s and I added some more settings.