Refact. Add compatability layer for mindy/validation.