Add more helper functions