Refeactor according to new API of Btrplace 30