Added many extra types