Port to Spree 1.3 (part 1)