Changed validation in Shape class