Added missing returns for empty functions and adjusted imports