Moved registration to dispatch_once