Modified schema and data-config; preparing for new major release