Add more base utilities