IMPORTANT: MAJOR BREAKING CHANGE COMING SOON