Added new types and changed formatting