Re-add methods that are still needed after all