added shape class