Registration fix
Reference property maintenance optimisation
Bugfix