Add more related functions