Add methods that were removed by mistake from the merge