Types improvement