Added new config features and options