Fixed validate method, doc blocks