Add new types to list of accepted types and remove deprecated ones

Add new types to list of accepted types and remove deprecated ones #3804