Types formatting added