Major revision to allow organisational entities in registration