Better config files, added cluster class to output