Added unit validation