Work on unit validation