Improved factories validating