Updated utilities