Added validation of variables in Shape properties