Add more helper methods