Added shape class.