[Users] Good time to add larger changes to the toolkit