Added Shape Class