refactored and added some more configs