Reworked validators to return Futures