Use new spindle version and get rid of using reflection