Re added static cylinder support