Simplified whenRegistered