Significant updates to the whole package