Fixed info
Added build groups to better represent build matrix