Added methods that got lost after merging