More debug features were added for validation