Shape module added