Move more helper functions