Re-added p versio support