Fixed validator, added embedded block