Improves compatibility ith 6.2 and adds documentation