Updated to use configs