Keep property argument, fix ordering to not break default updating callbacks