Added validation layer