Update for stackato compatibility