Added validation checks, even custom one