Updated to match code changes