Feature/support registering multiple times