Finalize shaape support