Added validation systems