Moved from utils repo