More data into the site table
Moved formats in their own table