Separated out the registering of events vs the registering of the extra api calls

Signed-off-by: license2e <ilya@shindyapin.com>