Registration: ICP added, Features reloaded -> work in progress