Move base to utils