Title: Move some methods to util