Add type to replace & unregister methods