Features added in this fork: