Restructured defaults and added new configuration capabilities.