Updated for statika-0.12.0