Updated file layout/added more variable types.