Added more helper functions