Updated BaseUtils