Updated Shape Class